From 46bad5d513e4715a912123f825226f3f2b096f06 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 10 May 2020 23:42:02 -0400 Subject: [PATCH] widget: Fix gtk_widget_focus_all for !focusable This was a case that wasn't handle properly when the focus is entering from the outside, in forward direction. --- gtk/gtkwidget.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 17e21b8b36..95639e7980 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -4982,9 +4982,16 @@ gtk_widget_focus_all (GtkWidget *widget, { if (gtk_widget_focus_move (widget, direction)) return TRUE; + + return gtk_widget_grab_focus (widget); } + else + { + if (gtk_widget_grab_focus (widget)) + return TRUE; - return gtk_widget_grab_focus (widget); + return gtk_widget_focus_move (widget, direction); + } } gboolean -- 2.30.2